From: iap10@firebug.cl.cam.ac.uk Date: Thu, 29 Sep 2005 18:59:18 +0000 (+0100) Subject: Allow kernel built with privileged operation support (e.g. -xen/-xen0) to be used... X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16769^2~1 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1a57cb756df3733254252f4f769893d49c3f58b6;p=xen.git Allow kernel built with privileged operation support (e.g. -xen/-xen0) to be used as a guest kernel on x86_64 Signed-off-by: ian@xensource.com --- diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c index cb0ffc9e51..3a090e24c1 100644 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c @@ -771,11 +771,14 @@ void __init setup_arch(char **cmdline_p) virt_to_mfn(&phys_to_machine_mapping[i]); } HYPERVISOR_shared_info->arch.max_pfn = max_pfn; - - - - + } + if ( ! (xen_start_info->flags & SIF_INITDOMAIN)) + { + acpi_disabled = 1; +#ifdef CONFIG_ACPI_BOOT + acpi_ht = 0; +#endif } #endif